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

* commit 'ae9787514d5709dff766f4791c00a4875eebbf50':
  Make the generated OTAs repeatable