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

* commit 'f402fa46257f4ef61ce1e91901dfb44ff5f7f87c':
  Simplify fused location provider.