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

Change-Id: I4be1978329ebb7976ce42b38c40519d4b2a2bd71