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

Change-Id: I82e3b82dd260fef67e4c17156d9a868771e70e61