Update squisher to account for underscores

Change-Id: I7009dfb429ec7e6d3a2ad4d4e74cc4599e063dec
Merge "Update squisher to account for underscores" into kk