Merge "Work on issue #16629489: Google (Play?) Services eating through battery" into lmp-dev