Merge "Add presubmit test for vendor overlay"