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

Change-Id: Ieb3e2b98cc61fef472fe471ae05bf9db7a9b66ed