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

Change-Id: If8dac151ae6a10f93c6faf6c1dec51562157d026