Merge pie-cts-dev into master. am: 7a78102df1
authorXin Li <delphij@google.com>
Thu, 9 Aug 2018 00:20:44 +0000 (17:20 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Aug 2018 00:20:44 +0000 (17:20 -0700)
am: d0997637e8

Change-Id: I75db96840e06d32081b3594982fc9e30bf8fe7f5


Trivial merge