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

Change-Id: Ifa9b1053988a664d6a272238f5c43a5fc7c1badb