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

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

Change-Id: I577539b29927b06f03f64b0456ad42d7fe7011f8