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

Change-Id: I6eeb47699193ee024e975915011b1c3c5483bf9e