Merge "Support multiple codecs in test infrastructure" into experimental