Merge "Merge "CodecListTest is not part of MTS" into tm-mainline-prod am: 9e72de62eb am: 943db3f351 am: c24a37d33a"