am 0e34529c: am 91d40b7d: Merge "User restrictions for creds storage & user...
am 0e34529c: am 91d40b7d: Merge "User restrictions for creds storage & user removal" into jb-mr2-dev
* commit '0e34529c':
User restrictions for creds storage & user removal