Merge \\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\" into lmp-dev am: e64034a27d  -s ours am: db7e70c2f0 am: e0cc5e20ae am: 0d457d1254  -s ours am: 199f6a490a am: 06c3f60136
am: 9088be4ebe

Change-Id: I886553aec1438d0857cdc52413008ecaf64bae2a