Merge "Add javadoc for new location API's." into jb-mr1-dev