Merge "Update test_live_migration for return-one-value"