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