Automatic merge from submit-queue
Prepare for using optimized conversion to/from map[string]interface{} in Patch operation
Ref #39017
Automatic merge from submit-queue
Prepare for using optimized conversion to/from map[string]interface{} in Patch operation
Ref #39017