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