am 261e195d: Merge "Make the generated OTAs repeatable"

* commit '261e195dacde109d4b438d8af3e370c87b162a5d':
  Make the generated OTAs repeatable