CB-7945 Made media.spec.15 and media.spec.16 auto tests green