Add Overrides, remove trailing whitespace.

Once and for all.

Change-Id: I0835515696c1a8ec7dff719fb734cbbd0b4252d6
1 file changed