Merge "Remove spurious WTF on pre-U devices." into udc-dev