Modernise code to use override specifier am: 3940254801
am: fb8d3dbea0

Change-Id: I5eea0722bd0a230b7892d32ce58c19f6bf651a1a