Merge "Revert "Create Codec2.0 service""