Merge "Fix for bug: #7172778. Javadoc errors in LocationManager." into jb-mr1-dev