am d0ffef4b: am 19b23afa: Merge "Fix for phone app crash in Icc Card."

* commit 'd0ffef4b43594e540cb867da18d4403b4f583622':
  Fix for phone app crash in Icc Card.