am 76e0d31f: Merge "Make test_track_devices.cpp output easier to read."

* commit '76e0d31f64e8d68cb39ae3ec6bc132f0d4752bca':
  Make test_track_devices.cpp output easier to read.