Merge "Consolidate Keystore alias prefixes."