Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev am: f1d9152f9f
am: 177422c91e

Change-Id: I7de2c4181d5b42e505310b4639eb82719ae42c16