Merge "Update incompatible charging string for different product" into udc-dev