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