Whitespace realignment before changes

Change-Id: I2eb7a47459760982cfb7324236d14f2a068fc22c