Merge changes Ib339bd0a,I4ff3ff91,I6863269e,I85d24118,Ic7ce23e2

* changes:
  Keystore 2.0: Refactor permissions. 5/5
  Keystore 2.0: Refactor permissions. 4/5
  Keystore 2.0: Refactor permissions. 3/5
  Keystore 2.0: Refactor permissions. 2/5
  Keystore 2.0: Refactor permissions. 1/5