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

Change-Id: I5d2fcf6ba90892abf55cbf61b760c2fbbe33c412