Merge changes I8c12e8e6,I4878993a

* changes:
  Set broadcast done when placing immediate call
  Handle potential emergency numbers properly