Merge "Add fused location provider to real provider list" into jb-mr1-dev