Merge "msm: board-9615: Update PID & serial number for DIAG" into msm-3.0