Merge "Translate the float scale value to a nit value when transferring the short-term model" into udc-dev