am f3166799: Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread

* commit 'f316679971be356dbb01f991e95742bc5f2a8383':
  Fix GSM permanent failure handling, DO NOT MERGE.