Removing remnants of the name-email test

Change-Id: Ifed6f8032588825b5b8ead1470c9e0a27d994a13
Merge "Removing remnants of the name-email test"