Merge "Allow some slop on socket time values" into pie-cts-dev
am: 214945b954

Change-Id: Ia188f9e89b3bcbec0edbbfaf29fe217d9f06e625