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

Change-Id: I61633ebe7944d54f3da36eedaf4bab7308ff3c96