Merge "Update expected pre dump file names" into udc-dev