Merge "[TIAF] Add null checks to avoid NPEs" into udc-dev