Merge "Enable verify jobs for external scenarios"