Merge "Allow test builds to optionally skip verification"