Merge "Update NR info using the most recent ServiceState" into udc-qpr-dev