Merge "releasetools: Merge two identical conditional branches." am: 59978ab6e3
am: 514e6e4488

Change-Id: I8f95b75becdb503c1837c1bc215f88f019eaa356