Merge "Unhide the new location API's" into jb-mr1-dev