Merge "Use multiple emails in per-file syntax." am: 1d3571cb88
am: f106a9a2c7

Change-Id: I08605f6f8def734385e26475625e88eb3b0c31bc