Merge changes Idb7a73f2,I7645b929,I12000613,I13322b5b into msm-3.0

* changes:
  msm: pil-gss: Move to common proxy voting
  msm: pil-q6v4: Move to common proxy voting
  msm: pil-riva: Move to common proxy voting
  msm: pil: Consolidate proxy voting into core