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 am: 95c9bef53b  -s ours am: 00e79982aa
am: c2ca406683

Change-Id: I8c8084567b8bdb954966ccb2360cbc27b89d65d3