Merge "Use multiple patterns and/or emails in per-file syntax." am: faac4ad153
am: 0e5bd4e656

Change-Id: I7ee7f00051c39acd8f440925b28362b45ed52f79