Merge "Merge remote-tracking branch 'origin/caf/stmhal/linux-4.9.y-gh' into msm-4.9"