Merge "Allow more leeway to fix time.clock_gettime flakiness."
am: 1f6adf5863

Change-Id: I8c8ae1368111ae3d6986e57d9c7f885d1df00284