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
Change-Id: Ia32fa9009d31f280b7f71fd8ed472913c4aa30b6