Clean up codes

Change-Id: I3a1ba7031830b6e482a28362824d6fcacfea53a3
Add Japanese code table

Change-Id: Icec027e3d2533afb37162b70663d88625c8edd17