Merge "Add @SensitiveData to Keystore service and callback"