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

Change-Id: Ia60c2884c1b8372862cae3d3f1e2b41c40cd1cb9