Merge change 692 into donut

* changes:
  location: Optimize use of mProviders ArrayList.