am 0b9bf311: am 9731b7e8: Merge "Fix bugs regarding ShortCodeTest that fails without "112" in ECC List." into kitkat-cts-dev automerge: 8fcd728  -s ours automerge: 6e8f6a7

* commit '0b9bf311660410cc00f7ef24f1a2e6b90fa3b063':
  Fix bugs regarding ShortCodeTest that fails without "112" in ECC List.