Merge \\\\\"Reduce shell power over user management.\\\\\" into mnc-dev am: 964500fd43 am: 9bfa0ad22f am: fb87ae59b0 am: 63e8198685  -s ours
am: a5e89439ff

Change-Id: Ic5b771c9d8738f6c3a60bb9332c964b26829047a