Remove extra whitespace

There are extra whitespace the patch file, so we should remove them to make code
more clear

Change-Id: Ic70c8cdd24d009de51f671f311c064415e02f8af
Merge "Remove extra whitespace"