Added the Override annotation to several methods where it was missing.

Change-Id: Ie0e083782f18abbd21479bb3d29eb31a72adc184