Merge "msm: mpq8064: Fix false error reported by VP" into msm-3.4