Merge "Revert "Cts test fix for shortcode 48000"" into kitkat-cts-dev
automerge: 5e6120e

* commit '5e6120ebd279d307f60ac898e786654ab9a2369f':
  Revert "Cts test fix for shortcode 48000"