Merge \\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\"...

Merge \\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\" into lmp-mr1-dev am: f1d9152f am: 177422c9 am: fd0757f1  -s ours am: 7975dd5b am: 008d66e4 am: e8458d8f
am: 1bb51dea  -s ours

Change-Id: I82e3b82dd260fef67e4c17156d9a868771e70e61