Merge "ApfTest: fix flaky testApfFilterRa." am: c2e8588396
am: 60e1375f79

Change-Id: Ied249e20ffc80728d20ac1e5442d45f5cb767776