Merge "Merge remote-tracking branch 'origin/tmp-35a7f35' into msm-kona"