Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 86eb4b9266

Change-Id: Icc7d0ce1fc6f761fe732ae3fc5d5bd96518f5ba1