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

Change-Id: Ia84cee5c083420a9fb2bdea3dbc15e19c58d984f