Modernise code to use override specifier am: de138911c8 am: ef9d233b48
am: abc414c0dd

Change-Id: Id9dbf76ec06fb095b90f1745b2f420ca6d0b166c