Merge "Replace OTA keys when signing for A/B devices." into nyc-mr1-dev