am c40a4350: Merge "Remove whitespace."

* commit 'c40a4350daac81ddbfc5f6ceab934f2180dc4ec6':
  Remove whitespace.