Merge "Fix parsing zero length IE sub-elements" into udc-dev