Merge "[conflict] Merge "Fix some nullable warnings." into udc-dev am: 9caf24df" into udc-mainline-prod