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

Change-Id: I131815def4c4fdd3c1c07ea06f6fe2bc643b89d4