Merge "Help on issue #8863955: Google Services keeping phone awake..." into jb-mr2-dev