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

Change-Id: I316808e7d3ff978dd3eb56a2f5a998f374a1aeab