Work around MSC "'override' cannot be used with 'inline'" bug

Change-Id: I667f701cdc15471d3b154c3b7e4a23487d540015