[cuboxi] linux: Integrate latest upstream changes.