Merge \"Fix collection timestamp unit in RttResult\" into nyc-dev
am: 6a6fddc42c

Change-Id: I7c672fc9984b6f340c89ebe078d6f6ddfb91ad0a
tree: 11b551fb04d6148c8de5a1108e6da43c1ed69950
  1. service/
  2. tests/