Merge "Allow platform_app access to keystore."