Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
authorXin Li <delphij@google.com>
Thu, 19 Jul 2018 20:50:07 +0000 (13:50 -0700)
committerXin Li <delphij@google.com>
Thu, 19 Jul 2018 20:50:07 +0000 (13:50 -0700)
Bug: 111615259
Change-Id: I87d2bd40f7e70f8e88af237d5814dc517b9cb00c


Trivial merge