am fda8379c: am f1597bc9: (-s ours) Merge "Fixed release of wakelock"

* commit 'fda8379c49cd45ef434d626532dc8d459fbabc5c':
  Fixed release of wakelock