merge branch 'pr-1084'
merge branch 'pr-1084'

LGTMs: @mrunalp @cyphar

Closes #1084

hqhq/runc,kolyshkin/runc,wking/runc,xiaochenshen/runc,adrianreber/runc,coolljt0725/runc,WeiZhang555/runc,kolyshkin/runc,avagin/runc,maxamillion/runc,WeiZhang555/runc,cyphar/runc,wking/runc,sunyuan3/runc,avagin/runc,shishir-a412ed/runc,mheon/runc,rhatdan/runc,kolyshkin/runc,coolljt0725/runc,mYmNeo/runc,laijs/runc,dqminh/runc,maxamillion/runc,coolljt0725/runc,kolyshkin/runc,docker/runc,vbatts/runc,xiaochenshen/runc,stefanberger/runc,sunyuan3/runc,shishir-a412ed/runc,rajasec/runc,laijs/runc,rhatdan/runc,justincormack/runc,rajasec/runc,cyphar/runc,dqminh/runc,crosbymichael/runc,opencontainers/runc,cloudfoundry-incubator/runc,justincormack/runc,estesp/runc,justincormack/runc,WeiZhang555/runc,vbatts/runc,opencontainers/runc,stefanberger/runc,rajasec/runc,stefanberger/runc,docker/runc,vbatts/runc,dqminh/runc,opencontainers/runc,mheon/runc,sunyuan3/runc,avagin/runc,adrianreber/runc,rhatdan/runc,estesp/runc,xiaochenshen/runc,jhowardmsft/runc,adrianreber/runc,wking/runc,mYmNeo/runc,hqhq/runc,mheon/runc,estesp/runc,laijs/runc,cloudfoundry-incubator/runc,mikebrow/runc,crosbymichael/runc,crosbymichael/runc,docker/runc,rhatdan/runc,mYmNeo/runc,cyphar/runc,opencontainers/runc,cloudfoundry-incubator/runc,mikebrow/runc,shishir-a412ed/runc,hqhq/runc,dqminh/runc,maxamillion/runc,jhowardmsft/runc,jhowardmsft/runc,mikebrow/runc