Merge \"Reduce shell power over user management.\" into mnc-dev
am: 964500fd43

Change-Id: I3531a208b4e2bd603bde2afcbee9589bf2f712d9