Tool Labs: minor fix to mailrelay.pp

Change-Id: I622b25eb79d0344fc314f514dce7a6afd243632d
Merge "Tool Labs: minor fix to mailrelay.pp" into production