Trebuchet: DA translation

Change-Id: I60cc597661ee9d5ea2f4446e8a2cd551c1209fa8
Merge "Trebuchet: DA translation" into cm-10.2
Merge remote-tracking branch 'upstream/cm-10.2' into HEAD