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

Change-Id: Icd3b09f098c19268ac888dd6195fb535979557ed