Merge "Ensure service info is updated so that checking for remote service uid returns the correct value." into tm-dev