Whitespace fixes.

Somehow commit 6d704298f8953950beb3c0aee81e3e9803e36149 managed to sneak
in with 8-space tabs and space-indentation.

Change-Id: Ida57cd6e80e77aa660eb1c9f083c5fee85f5b0af
Merge "Whitespace fixes."