Merge "Unhide new location manager APIs:" into kraken