Various changes to wmt-ko

Change-Id: Ia2a4db5ab84eb6848dccaf7c8a1b7300bbf23882