Merge "Keystore 2.0: Adjust executable name for keystore."