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

Original change: undetermined

Change-Id: Ib5575833287545f4019ceb7e8e8aef2d91321c4f