Merge "Temp disabling of some apps in SDK build."