Merge \\\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\\" into lmp-mr1-dev am: f1d9152f9f am: 177422c91e am: fd0757f195 -s ours am: 7975dd5b48 am: 008d66e49c am: e8458d8f88 am: 1bb51deaf4 -s ours am: 5441a248f4
am: 8fed0636c8
Change-Id: I79ef5d60a2357ad717cce1cb0e717a06dc785c52
This commit is contained in: