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

Change-Id: I9d69b49bff52228e1c1e9d020b732ab53ed3f8e9