Merge pie-platform-release to aosp-master - DO NOT MERGE
authorBill Yi <byi@google.com>
Wed, 24 Oct 2018 21:48:45 +0000 (14:48 -0700)
committerBill Yi <byi@google.com>
Wed, 24 Oct 2018 21:48:45 +0000 (14:48 -0700)
Change-Id: I052cfae991c063eb5631e681be600d2da8111fc6


Trivial merge