am 583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1

* commit '583fdf0068ac46fb384a5aa2b193faf743f8221c':
  Handle emergency call back mode correctly