Whitespace improvements

Change-Id: I691f950c0decfeb65c4bea8945e6cea86ff95e73
Merge "Whitespace improvements"