Merge pie-cts-dev into master.
authorXin Li <delphij@google.com>
Wed, 8 Aug 2018 18:43:04 +0000 (11:43 -0700)
committerXin Li <delphij@google.com>
Wed, 8 Aug 2018 18:43:04 +0000 (11:43 -0700)
Bug: 112051819
Change-Id: Ide79ad146b80a923cfd00ec1e526b8b389e54b29


Trivial merge