Added mechanism to prevent false test failures based on the
eventual consistency of Swift.

Change-Id: I1b36911071aca4de075cc806dd70291c0599d052
Merge "Added mechanism to prevent false test failures based on the eventual consistency of Swift."