remove trailing whitespace

Change-Id: I3f36638045b4f7acd53383797dd5439add5c566c
Merge "remove trailing whitespace"