Unified Email: AST translations2

Change-Id: I2a7f947bee39e776b1d91605b48142a2fe2ec3ce
Merge branch 'upstream/cm-11.0'