Merge \\\\\\"Reduce shell power over user management.\\\\\\" into mnc-dev am: 964500fd43 am: 9bfa0ad22f am: fb87ae59b0 am: 63e8198685  -s ours am: a5e89439ff
am: 25d2682bef

Change-Id: Ic03848c29b69665805b704948276edfb9d55f270