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

* commit '5f871ba1e08c7165a8a6dd417701320f5952bf17':
  fix wekelock issue