Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-dev
am: e64034a27d  -s ours

Change-Id: I1f1d3ae381040bf37bf23a40e6fdc17f842a13a1