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

Change-Id: Idd92350e26a28821ddc2f9af505b28b5873a7f78