Merge "OO NOT MERGE allow connected location providers location access" into jb-mr2-dev