Merge "fix common state service root test" into udc-mainline-prod