Dont use EMAIL_SUBJECT env if it is null string

Change-Id: I2e653901ae18e6654d0b7b48f5982ce384b3e0b4
Merge "Dont use EMAIL_SUBJECT env if it is null string"