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

Change-Id: I5535f68ff670881dfa10bac6b0628d3647be97bd