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

Change-Id: Ia69bd2f77574a741329660dfe2c394b0329853e7