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

Change-Id: I53ecb7a4a0d01e1e22aaeea83c5f4e501bae5bbe