Merge "Emergency redial implementation" am: b3b09849bc
am: f5a457244c

Change-Id: Ied2aa7255546df647b01884b6c1689c6192e1d67