Merge "Move some remaining dex utilities" into pi-dev