Merge "Switch to new location mode API recommended by API council" into klp-dev