Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
authorXin Li <delphij@google.com>
Fri, 20 Jul 2018 06:23:37 +0000 (23:23 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jul 2018 06:23:37 +0000 (23:23 -0700)
am: 49dc66d971

Change-Id: Ief923dd2f8e02c97473381bc886f5bee9d9ff0d4


Trivial merge