Merge "Mainline API cleanup"
diff --git a/assets/carrier_list.pb b/assets/carrier_list.pb
index c23d371..993903f 100644
--- a/assets/carrier_list.pb
+++ b/assets/carrier_list.pb
Binary files differ
diff --git a/assets/carrier_list.textpb b/assets/carrier_list.textpb
index 8439b87..c8e524a 100644
--- a/assets/carrier_list.textpb
+++ b/assets/carrier_list.textpb
Binary files differ