Merge "Revert "Cts test fix for shortcode 48000"" into kitkat-cts-dev