Merge "Keystore 2.0: Add SensitiveData annotation."