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

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

Change-Id: Ia9f6d50c60621431781986062491e7c3fbf92f94