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

Change-Id: I343863180866b38af4f91a6f79068c21096e7ce0