Merge pi-dr1-dev to aosp-master
authorBill Yi <byi@google.com>
Fri, 19 Oct 2018 19:20:42 +0000 (12:20 -0700)
committerBill Yi <byi@google.com>
Fri, 19 Oct 2018 19:20:42 +0000 (12:20 -0700)
Change-Id: Ida0bc98526f4fc7a1c20f5bbd3210b2f6156d459


Trivial merge