Merge "add languageTable and languageShiftTable to calculateLength" am: e5f36d48ef am: b73b9c9f76

Change-Id: Id77835e408e0ad06122c0e7ea15e6b167b39b053