am 86cb67b1: am 28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev

* commit '86cb67b199e22136f461a4798bed32c98e6e145c':
  Ensure wakelock is released unconditionally.