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

Merge \"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 am: 903fb640\" into nyc-mr1-dev-plus-aosp
am: b47fa455  -s ours

Change-Id: I25dd03825d129ec21d95ece658c3f6d238f04daa