am 8e2eb583: Merge change I22cf0509 into eclair-mr2

Merge commit '8e2eb583e73e1e4813999bc0f49cc26d8d63bcb8' into eclair-mr2-plus-aosp

* commit '8e2eb583e73e1e4813999bc0f49cc26d8d63bcb8':
  Add China data to MccTable.