Merge "Fix the build blocker in verify scenario job"