Add missing @Override annotations

Change-Id: I4c5772c9549375beeb0e4f269bd61d623fca7e35
(cherry picked from commit 49992f5003aac55e1b1cf54769abc93630ccde93)
2 files changed