[automerger skipped] Merge "Fixes switch-user -w command." into rvc-dev am:...
[automerger skipped] Merge "Fixes switch-user -w command." into rvc-dev am: a0eed34e am: 7c091e37 am: 04f0ba8b -s ours
am skip reason: Change-Id Ib3d70d21cc379f136983f9ddcda31f5bab3f045e with SHA-1 fd7c398e is in history
Change-Id: I9403cb75ca5d464b4e1c24f7a0b9f045118a9b14