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

Change-Id: I86a852a2216971095d4aa256a97f0b8e68e73646


Trivial merge