Merge "Use multiple patterns and emails in per-file syntax." am: d3f10fe89c am: 697a0b6634
am: 7a84739070

Change-Id: Ibb610fabef94dfe309275f9d1dcb29e5ddf8f270