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

* commit 'acd341d8682ca57c1066d664725ebc72f5ef10c1':
  OO NOT MERGE allow connected location providers location access