Merge "Reduce shell power over user management." into mnc-dev