(no-ticket) settings email from variable fix.

Change-Id: I05a09ec7081427bdd1ddc5168f4c3ef187b3af64