Merge "drop the latest carrier id table in text format" am: 53cb6aa35a
am: 9ac8a9ad1d

Change-Id: I89ce360bf79de5836a5d30f4acc2b44fd0ac9f4d