am 678fe4d3: am b9a4a83f: Merge "Fix bugs regarding ShortCodeTest that fails without "112" in ECC List."

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