Merge "Send empty string for redial" am: 134960dc53
am: a3ba6b9309

Change-Id: I49a460e5feeccf8e7498659a8129fd52c0c6d0f2