Merge "Add support for auto redialing 911" into pi-dev