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

Change-Id: I3b6be3957589731274ce56034cd5f655874b2fd0