Merge "Add batch generation to OTAGUI." am: 2e1cfae4fd am: 2f8719ccad am: b7b945a034

Original change: https://android-review.googlesource.com/c/platform/development/+/1775726

Change-Id: I1a9e33977fb225538911cdbd49d4c7c94446401c