Merge "Fix skip_checks in live_migration"