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

Change-Id: I6114f0a1465810c5d29b687c1b0c785c631ebc45