am 8f5dd9ad: Merge "GPS Provider Service changes"

* commit '8f5dd9ad3f98d97d2862b57ba8cd961d2201e40c':
  GPS Provider Service changes