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

Change-Id: Ib4f04849819432248e069997659215ecf2840e67