Merge "Set mOriginatingAddress and mRecipientAddress separately" am: 44ea78d8ff
am: ab90035993

Change-Id: I02833dfbb5af129f326370d9c09968f167fef19e