Fixed a bug with incorrect handling of onUnlockUser am: 0f57cce644
am: b8310b6b25

Change-Id: I2431fd1f59560c1b5ee1e3a8f7917fc448f9071c