[Bug 900869] Step 1. Fix non-English highlighting.
[Bug 900869] Step 2. Fix non-English highlighting.