Merge \\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\"...

Merge \\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\" into lmp-mr1-dev am: f1d9152f am: 177422c9 am: fd0757f1  -s ours am: 7975dd5b am: 008d66e4
am: e8458d8f

Change-Id: If984b3437bc60d99e693907aef24f3b7b1218836