am a500ad4a: Merge "Add in the fallback fused location provider." into jb-mr1-dev

* commit 'a500ad4a34332deb8025b02045b570f8f84f6ed8':
  Add in the fallback fused location provider.