Merge "Remove unnecessary indexes for Location services" into udc-dev