Merge "releasetools: Merge two identical conditional branches."