Merge "MAP: Add content transfer encoding property for MMS body"