* commit 'a0a646245c6aefa9d8303b641256381e639f0d47': Work on issue #16629489: Google (Play?) Services eating through battery