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

Change-Id: Idd92350e26a28821ddc2f9af505b28b5873a7f78