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

Change-Id: Ie36d24fa75121430db5ec9cfd73aec36efd0a706