am 61b06be2: am 155b0ee0: Merge from open-source gingerbread

* commit '61b06be285ef03381b1d788996650863a1606b36':
  fix for supporting 3 digits MNC code