make AFT test less flaky

Change-Id: If25afb6ef27d551379a4ef522792738572ec0214
Merge "make AFT test less flaky"