Merge "Keystore: Use waitForService() instead of getService()" into main