Merge "Fix build failure due to unused string resource" into udc-dev