Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
authorXin Li <delphij@google.com>
Fri, 8 Jun 2018 18:07:02 +0000 (11:07 -0700)
committerXin Li <delphij@google.com>
Fri, 8 Jun 2018 18:07:02 +0000 (11:07 -0700)
Bug: 79597307
Change-Id: If2ada4dd7bce7602babdb2090dc4cda82b184fc1


Trivial merge