Merge "Update squisher to account for underscores" into kk