Merge "Do not CloseGuard KernelID or FieldID"