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

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

Change-Id: I16cc34cf94fc78d7e0e5e741b7295aeb7dfc04a3