Merge "msm: pil-riva: Hold wakelock while proxy voting" into msm-3.0