Migrate to @Override to remove warnings. am: 078d356a9b

Original change: undetermined

Change-Id: Iaba016fbd8e2803aae910cec366d14b71d05da61