Merge "Refactor the frontend for batch generation." am: 89e47defef am: 8f08ab906f am: dd360e3272

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

Change-Id: Ia7570629a41ccde69538a7f1bc4c22eb618b0831