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