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

* commit '04bb190c541a2cecd9bdf33ec35474a2e9f8f95d':
  Simplify fused location provider.