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

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