Merge "Fix testApfFilterKeepaliveAck."