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

* commit 'e5121f0e6ab3303f22c7db8925db907d95bc82aa':
  Ensure wakelock is released unconditionally.