bring in Trebuchet

Change-Id: I427d9a3edcbf808d229f04b5230b5ff224d1e49c
Merge "bring in Trebuchet" into kk4.4