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

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

Change-Id: Ie7b8e901e3fbb46f3d7d76b1bc8ea8bc6c31eb63