am 23025ffd: am 11c6847d: Merge "Unhide new location manager APIs:" into kraken