am 8226140c: Merge from gingerbread

* commit '8226140ccadbc8e0bdd093f8bab0a5292b9224e3':
  fix for supporting 3 digits MNC code