[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: 31f2268b -s ours
am skip reason: Change-Id Ib3d70d21cc379f136983f9ddcda31f5bab3f045e with SHA-1 fd7c398e is in history
Change-Id: I40ff256eb98d27c6f8d179d0f60918384e989962