Merge "Use multiple patterns and/or emails in per-file syntax."
am: 88e452bfe6

Change-Id: I9581df6a7010dbd4b81ef1e5b0895d8754402f8a