Merge \\\"Reduce shell power over user management.\\\" into nyc-dev am: 1b4124fc95 am: a2ef5c89c0
am: ead9f32ed2

Change-Id: Icf858615c4bb443437dbbdc225f3a32f778320ea