Merge "Replace OTA keys when signing for A/B devices."