Merge "Use multiple patterns and emails in per-file syntax." am: 62d0edc6ef
am: f16ded6120

Change-Id: I76a342fdc7097ba5941f78873145999612379e6c