do not use pop(key, default) since api assigns None to dict values Former-commit-id: 3ebbd0b55ea07de2897c27ca54eeab5c3b319419
Former-commit-id: 353561f0e3914de3f81499c4e4b831ae0a6383b6
Former-commit-id: a07ff0c083558cfe6f474d13027642d3052fee08