Merge "Use multiple patterns and emails in per-file syntax."
am: 62d0edc6ef

Change-Id: I15a2aaf9dd002f1164146d81e8adbbe2bca74231