Modernise code to use override specifier
am: de138911c8

Change-Id: I9167c72fd1bc646a1d266dd32b6470fe101074e9