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

Change-Id: Idf3c0904f9695e04b48901c23c79b7dcd101d0dc


Trivial merge