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

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