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

Change-Id: Ia54f3ad9a8594e101407db6b52b378ae8bec72a2