Merge "msm: 9615: Add xo voting support" into msm-3.0