Merge "releasetools: Clean up ReplaceVerityKeyId and add tests."