COMP: Use ::ZeroValue() instead of ::Zero.

Also strip trailing whitespace to satisfy the commit hook.

Change-Id: Ic2125132f5e4e743f54f0a367186fce45c289172
Merge topic 'ZeroValue'

3da3bd18 COMP: Use ::ZeroValue() instead of ::Zero.