Carbon Fibers: ES translations

Change-Id: I54f9a1c466042654ca3997dfff55ee14fd1795a8
Merge remote-tracking branch 'upstream/jb3' into jb3