Merge "Fix the null toString logic." into udc-dev