Merge "Update testFullApfV4ProgramGenerationNatTKeepAliveV4 to use new APIs" into main