Merge "New location service permission strings." into jb-mr1-dev