Delete code to clean up old updates (not needed since SDK 39 + caused OTA updates to break for Android) Merge branch 'master' into ui-changes