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

* commit '0b3af353dcf61177158934a11404cf2914038696':
  GPS Provider Service changes