Merge "Remove location permissions" into mnc-dev