am 928b851c: am ae978751: am 261e195d: Merge "Make the generated OTAs repeatable"

* commit '928b851ca178733ba61eef72a1b7e004f9a111e7':
  Make the generated OTAs repeatable