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

Change-Id: Ia9f6d50c60621431781986062491e7c3fbf92f94