Merge "AOSP/UnifiedEmail - bug fix to composing messages."
am: 037b1df509

Change-Id: I74d2c0ac6dd14d6fb96bc4808201c07211befaf6