Merge "ApfTest: fix flaky testApfFilterRa."