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

Merge \\\\\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\\\\" into lmp-dev am: e64034a2  -s ours am: db7e70c2 am: e0cc5e20 am: 0d457d12  -s ours am: 199f6a49 am: 06c3f601 am: 9088be4e am: 95c9bef5  -s ours am: 00e79982 am: c2ca4066
am: 122329cb  -s ours

Change-Id: I97ddd590d3873008f9851935bf0e2380d439b2c9