am 155b0ee0: Merge from open-source gingerbread

* commit '155b0ee0498cf863091f3f83a752eaaedf1257f8':
  fix for supporting 3 digits MNC code