Merge "Move the same-name-different-product configs from res folder to res-product folder" into udc-dev