Merge "UPSTREAM: Merge PC52 commit '61d5f54' into msm-4.9 (mainline) - 12/06"