Merge "Update ecc data" into udc-dev