Merge "Allow some slop on socket time values" into oreo-cts-dev