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