Add an 'override' specifier to testrunner am: ef9e1320c4
am: 60991ab070

Change-Id: If95440b24199b91c8aec870800b2b3dd3b16bbd6