Adding strip-to support

Change-Id: Ibf271330049c887d02dd6a6fd4742ad12540630e