Merge "FP2-1452:Need change serial number to assemble number" into fp2-dev-v2