Resolve whitespace errors

Change-Id: I66adf1626b137d668e2b94960641d37082ef36d7