Implement the following change from the runtime-specs: https://github.com/opencontainers/runtime-spec/pull/1271