am 316d7a16: Merge "fix wekelock issue" into jb-dev

* commit '316d7a16ff6624cc6e4b23c18ce11b2a96c444c6':
  fix wekelock issue