Merge "Emergency redial implementation"
am: b3b09849bc

Change-Id: If7fe179da4eb4c639dad1e2957f091bbee9e54f9