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

* commit '82b946496e2a503b5b21af318af5be828a223a44':
  Changes to support updating location providers.