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

Change-Id: Ie40e27219cc741bdb58fc0e2ac1fa2559d34730c