am 9fad0d77: am 5e6120eb: Merge "Revert "Cts test fix for shortcode 48000"" into kitkat-cts-dev

* commit '9fad0d7751a109b26b091049b83ea1cd980f7c96':
  Revert "Cts test fix for shortcode 48000"