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

Change-Id: I4e517e522896242fb9b23b21c217c6fd876ef8b7