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

* commit 'c1a1cca866ff76a6dbfa500292593d8031908a9b':
  Fix 5487180: Check for empty plmn/spn strings instead of just null