am 6cc282c1: am 0d4a9405: am ecb7b37b: Merge "Assert the stash size when generating OTAs."

* commit '6cc282c10ac60beb1c06b1fdd2f9db1e2b9ba9f5':
  Assert the stash size when generating OTAs.