Merge \\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\" into...

Merge \\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\" into lmp-mr1-dev am: f1d9152f am: 177422c9 am: fd0757f1  -s ours am: 7975dd5b
am: 008d66e4

Change-Id: I18ca4b24a2e18b122106027568cb92e3a10822ca