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

Change-Id: I16b931a3383794e646ab71011510926e49da3599