Merge "Revert "msm: pil-q6v4: Increase PROXY_VOTE_TIMEOUT to 40 seconds."" into msm-3.0