Merge pull request #10851 from arunagw/fixing_build_pending_migration

Fixing build for not checking migration