Merge "Merge remote-tracking branch 'origin/tmp-11da3a7' into msm-kona"