Merge #11952: [qa] univalue: Bump subtree