Merge "UPSTREAM: Merge commit '88a33ae' into msm-4.9_UPSTREAM - 11/14 - PC029"