Merge "Flatten KeyStoreKeyProperties constants." into mnc-dev