am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev

* commit 'e09aed49e3498c9e0f3545ab97f816233d5eac66':
  Changes to support updating location providers.