Merge "Use multiple patterns and/or emails in per-file syntax." am: 1d4cb7b380
am: e8bda98a11

Change-Id: I21e2cfbfb740c1886579339faad792aa1b02d6e9