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

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