Code cleanup, remove trailing white space

GCP-10342

Reviewer: Chezka Arevalo