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

Change-Id: If736316402c49153d4c8552672c90552548f90b8