Merge "releasetools: Fix the payload public key replacement." into nyc-mr1-dev