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

* commit 'e7c6eea7b42c233fe4de61b72e4f72e7614909e1':
  fix for supporting 3 digits MNC code