Merge "releasetools: Fix the expected total blocks."