Merge "Check for IllegalArgumentException in removeIfaceV1_1." into udc-dev