Merge \\"Prevent NPE in dispatchUserSwitch\\" into nyc-mr1-dev am: 340105677e
am: e37af56a6f

Change-Id: I4e9d921a55459d0c4638bc0993db2a665e1d310a