Merge "Fix silent redial operation" am: ddbac41b70
am: f20cee5233

Change-Id: I51046f0b5cda56ee571292d96658de415430d7f6