am f079a659: merge from open-source master

Merge commit 'f079a659774473324b5739652c014229189a10ff'

* commit 'f079a659774473324b5739652c014229189a10ff':
  Fix hang when error in SIM card communication