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

Change-Id: Ifd159a3763c106985ccc6b5ce7a32d43dfcc2333