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

Change-Id: I0b567214374549a6c2526180b0c35f1aab2d1d4c