Merge "Remove code related to extended-opcode."