Merge "Add negative tests for per-patch output aggregate types."