Merge "Fix NPE." into udc-dev