Merge "Update carrier_list.pb and .textpb"