Remove trailing whitespace.

Change-Id: Ifd2fbc43c719d77c88d9b37958cf3c36ed0efa7c
Merge "Remove trailing whitespace."