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

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