Revert "Trebuchet : Fix dynamic padding"

This reverts commit efa4b8d18459243abf379bb0135ee0a89165a50a.

Change-Id: Ibc3857b7cb94cce395cbaa2671b34cced3a538b9
Merge "Revert "Trebuchet : Fix dynamic padding"" into cm-10.2