Merge "Merge "Ensure service info is updated so that checking for remote...
Merge "Merge "Ensure service info is updated so that checking for remote service uid returns the correct value." into tm-dev am: 31b9a4cb am: ebe89c5c am: 40da2b12" into tm-qpr-dev-plus-aosp