Merge "Fix the build blocker in verify scenario job"
-rw-r--r-- 31 .gitignore
-rw-r--r-- 87 .gitreview
drwxr-xr-x - jjb