Merge "Throttle location update rate in proximity alert" into oc-dev