Merge "Fix mte_upgrade_test" into main