Merge "Fix NPE while handling 380 response" into udc-dev