Merge "Use multiple patterns and/or emails in per-file syntax."
am: 1d4cb7b380

Change-Id: Ia42ab1dd91006653e46c3233394798b6aa328f8f