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

Change-Id: I63bb1c87e01b3536096a508046dba9de8b88bb59