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

Change-Id: I0a45e0e1cec68bca769a760e98863d62032baa05