Merge "Use multiple patterns and emails in per-file syntax."
am: 5dfb67a24a

Change-Id: I820d076a8980c9198c8a94591912b046ee3ad3d6