trim incoming string values

Change-Id: I0055dddbb0b810432879d275e1e102069e7736c2