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

Change-Id: Ia608e9ce2a2c842971c5424fea8823069a5f6449