Fix unifiedemail build

Change-Id: I0b2aec35529c40ce48651e5c7aad07102bb2399a
7 files changed