Merge "Set mOriginatingAddress and mRecipientAddress separately"