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


Trivial merge