Merge "Make pip size spec calculations more precise" into udc-dev