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 am: 9088be4e
am: 95c9bef5  -s ours

Change-Id: I7b406c32d9231f2850651d09fc58e2dc50c38b8a