Merge \"releasetools: Fix the payload public key replacement.\" into nyc-mr1-dev
am: 0821fab13a

Change-Id: I15ef57cc520cc2d55ea382688da737d57281358b