am bfb29465: am 04bb190c: am f402fa46: Merge "Simplify fused location provider." into jb-mr1-dev

* commit 'bfb294651eb68b20e11ca7e1edd4cd23f1116291':
  Simplify fused location provider.