Merge "fix for supporting 3 digits MNC code" into gingerbread