Merge "Fix length of descriptor field when reading debug info."