Merge "msm: Add support for early random numbers" into msm-4.8