Merge "Fixes in responding call via sms" am: 926347bf56 am: 0b827de0bd am: 4d9fc4d4d0
am: 7bc4249bc9

Change-Id: I51f225736cb9b01f4fdc7cb88cd8fa4465f1de98