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

Change-Id: I0e1099c28f0afa2dffb856ccb2528fc79b6da57b