Merge \\"releasetools: Fix the payload public key replacement.\\" am: 8a09095c34
am: c4449f819c

Change-Id: I1614d0af292c4cb0b6c9b9bc208194c30179c7b9