Strip margins too

Change-Id: Ic243d2072b849217a42075426a91deb3fc6fa172