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

* commit '6e8f6a7735c7545027f9db25d103fa5e38dd7a50':