am fd89d2a0: am 756d5ac2: am e0c0e93a: am d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev

* commit 'fd89d2a07a642aeb75930ba3595ee0be8795b360':
  Fixed wake to unlock when the device has never been unlocked