Fix issues in pipeline.timestamp.transfer_tests
authorPyry Haulos <phaulos@google.com>
Tue, 5 Sep 2017 15:14:23 +0000 (15:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Sep 2017 15:14:23 +0000 (15:14 +0000)
am: 0f672f2a20

Change-Id: Ib7e13db1c7801095b925890f226a38969a1b418e


Trivial merge