Merge change 25092 into eclair

* changes:
  New field in CallerInfo to cache if the call is an emergency one.