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

* commit '28c9590b90215230b65d98c4d816e0d776a07540':
  Ensure wakelock is released unconditionally.