Remove some whitespace

Change-Id: I9317b2a517c3833a49dfd7b012baf8a870240a05
Merge "Remove some whitespace"