am e0dda90b: am aa64548d: Merge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev

* commit 'e0dda90bde531b12dda8ce0909040b070c3b2b84':
  Fixed unreleased wake lock isues and NPE.