Merge "Nist-SIP: Suppress MissingOverride warnings"