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

Change-Id: I2ac787ff911ecc37d28fdd2ea0c2a11e31b720fe