Merge "Fix bugs regarding ShortCodeTest that fails without "112" in ECC List." into kitkat-cts-dev