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

Change-Id: I94f65a46948a26260aef08af18b8e4b2a5e1f7cb