am a82ee49a: am 8f5dd9ad: Merge "GPS Provider Service changes"

* commit 'a82ee49a7b130ffe3199a488c7bb0ca4464af64c':
  GPS Provider Service changes