Merge "Fix null pointer exception in onSuccessConfigReceived" into udc-dev