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
am: 5441a248

Change-Id: Ib4f04849819432248e069997659215ecf2840e67