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

Change-Id: If1efe45dc85047475c074f1d6ae086de06460ddf