Merge "Keystore 2.0: Rename keystore2 enable property."