Merge "Fix bug in device path proto reading" into main