Merge "Revert changes to StationaryThrottlingLocationProvider" into sc-qpr1-dev