Upstream: fix presubmit fails- whitespaces