Merge "Fixes in responding call via sms"
am: 926347bf56

Change-Id: I698c8a33567c4183ba3d0fa976135f8cedf00299