Merge "Update tee patches in the thread loop." into udc-dev