Merge \"Replace OTA keys when signing for A/B devices.\" into nyc-mr1-dev
am: 008babb191

Change-Id: I7062b5245187446c686ff58391dda7286e5ac887