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

Change-Id: I45456aefced1cec7b61f2f5d69f1e249e7d3c711