Cleanup annoying whitespace that causes red markers

Change-Id: I0b1be110b0e0a9606d272c4d023f40ff93522725
4 files changed