Merge "msm: mpq8064: VCAP corner case bug fixes" into msm-3.4