Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 19c9669bdb

Change-Id: Ibfcd10934a4d0cafa28c7e7663db9a6b0d4963da