Merge "Use multiple patterns and/or emails in per-file syntax." am: 4eb385c5da am: d1f7c70a2c
am: b85e9e611b

Change-Id: I6b47cee752a5d92cc09a5a76b86c1815d8f745d8