Merge "Revert "Add feature ids to system server services that requset location.""