Merge "msm: mpq8064: Avoid NPL clock overflow" into msm-3.4