#677: Use retry filters in UT
Merge pull request #818 from andrerod/android

#677: Use retry filters in UT