Trebuchet: UG translation

Change-Id: I386f78366a618e07a320811aa8f4db38853616dd
Reorder for GMS

Follow GMS guidelines

Change-Id: I24e36ff5ab3750bea5f715b71de9cabca1933765
Merge remote-tracking branch 'upstream/cm-11.0' into HEAD