Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-dev