Merge "[Location Accuracy] Change the flag appropriately" into sc-dev