Merge "LocationManager javadoc permission fixes" into jb-mr1-dev