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

Change-Id: Ib84508c7617610ff81d3ec29bc5130048e4cecd3