Merge "UPSTREAM: Merge commit '5851a26' into msm-4.9 (comp dev)- 11/09"