Merge "Clean up Preconditions related TODOs." into udc-mainline-prod