Merge "Use multiple patterns and emails in per-file syntax." am: 7dd3f1dca6
am: bb6b0f578a

Change-Id: I5547ca8887d5d24871af665acb71facc61aafd16