Merge "Merge "CtsMediaV2: release codec in @After block" am: a6a469a2b8" into tm-dev