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

Change-Id: I4c887b38b3e840cabb2a1ff3b13a8a0f0d2fa68d