Merge "Remove location  access" into sc-dev