Merge "Merge remote-tracking branch 'origin/tmp-6bf4ca7' into msm-kona"