trim properties

Change-Id: I58f2dbab5047dd0b7e577fef7eae6f9948b87843