Merge "Use defaults to reference current keystore AIDL"