Merge "Assert the stash size when generating OTAs."