Merge "Address API council comments on location mode API council" into klp-dev