Merge "Fix 5487180: Check for empty plmn/spn strings instead of just null" into ics-mr1