Merge "Keystore 2.0: Revisit Key Parameters"