Merge "releasetools: Fix the payload public key replacement."