Merge "msm: pil-riva: Partially revert 6fe41b0"