Merge "Use multiple patterns and/or emails in per-file syntax." am: 88e452bfe6
am: 4b189a2b23

Change-Id: I8393613da28f430c530434b4a5c0eb4042f56a74