Merge "msm: pil-riva: Simplify and fix CXO voting" into msm-3.0