Modernise code to use override specifier
am: 3940254801

Change-Id: Ifc5fe42f04f174a38e404bb3abd30c80a6106d4b