Merge "msm: Do not use offset, when reporting  image version string"