Merge "CleanSpec for DynamicAndroidInstallationService"