Also strip the final value

Change-Id: If5a3f05146a58fafa8152e0c7710daecdcc120b3
Fixups

Change-Id: Iaac0bac4269289bc1d3ae7f1c6dec1f125668986
Fixups

Change-Id: Iacad3f7b6560f1734ab13d5ebf331bcea6346f23
Fixups

Change-Id: I1d1672711d975fecd3c5a3087b5679f016035f1d
B

Change-Id: Id5b7c19f231fdde2eb26430a177986c02deefbdc