Merge "UPSTREAM: Merge PC57.5  commit '9d1406e' into msm-4.9 - 12/11/17"