Merge "Fixed a bug with incorrect handling of onUnlockUser" into nyc-dr1-dev am: 05918fd123 am: 06f06dd228
am: cc000863db

Change-Id: If96a1d0c2d81eb57be4b19442501a1d5ed8987ca