Merge from latest apitrace fork back.