Merge "Add constants kDsuScratch and kDsuUserdata"