Merge "UPSTREAM: Merge commit '3f8372c' into msm-4.9 (kernel comp dev)- 11/07"