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

Change-Id: I652af5ae7051cbb83e5361f51f586a2c4940b8ac