Merge "Emma: Suppress MissingOverride warnings"