Merge "Clear all APF memory in testDropPingReply() in preparing stage" into main