Merge "releasetools: replace verity keyid" into nyc-mr1-dev