Merge change 263 into donut

* changes:
  location: Generalize support for location provider usage tracking.