Merge "LocationManager permissions cleanup" into jb-mr1-dev