Merge "Doc bug B9297954: Fixes to Location APIs" into jb-mr2-dev