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

Change-Id: I25dd03825d129ec21d95ece658c3f6d238f04daa