Merge "Modernise code to use override specifier"
am: 4699cf6174

Change-Id: Ia22c546feed8711579cc5aaf4833cf29652506c2