Changing default for email per specs

Change-Id: Ie60d5559d3df2d6d360b022e565a2c0514445e77
Merge "Changing default for email per specs"