Merge "Location provider app ops remapping" into sc-dev