am 639421cb: am fed4a556: Merge "Move wakelock release to handleMessage" into klp-modular-dev

* commit '639421cbd9780b9093bdf3415a79489c118ecb92':
  Move wakelock release to handleMessage