Merge "Update testInfiniteLifetimeFullApfV4ProgramGeneration to use new APIs" into main