am ce8436f5: Merge change 3593 into donut

Merge commit 'ce8436f52e7f2c80f94e43d80d28cc962b7ff83b'

* commit 'ce8436f52e7f2c80f94e43d80d28cc962b7ff83b':
  Cleanup whitespace.