Merge "Merge remote-tracking branch 'origin/tmp-84df952' into msm-kona"