Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-dev am: e64034a2 -s ours am: db7e70c2 Change-Id: I8ebc5346b9a8a38efa16f7bbd23ddaa97f3780e0