Merge "Use multiple patterns and emails in per-file syntax." am: 5dfb67a24a
am: 899d0d43a4

Change-Id: I178cd1dbd30ec52bdd647bc04d3600cd66ff5d77