Merge "Updating byte-buddy from 1.8.15 to 1.9.3"