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

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

Change-Id: I0e9ccb6d87ced9b6bdf2d0f0035bbeb18a45ea29