Merge "[Refional Preference] Fix test case fail" into udc-qpr-dev