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

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