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

Change-Id: Iaf7f8d314afe7d03cd119a861f94da10a9666a84