Merge "Use multiple patterns and/or emails in per-file syntax." am: 4eb385c5da
am: d1f7c70a2c

Change-Id: I19eb13d05145e6831a09ffc858786304235763ea