Merge "VTS: Test specifying --expect_upgrade {yes,no}"