Merge "UPSTREAM: PC27_PC28: Merge commit '2312efe85663f088e421d38b6fc103884aba7821' into msm-4.9 - mainline -11/13"