Bring in-line with ParanoidAndroidOTA