Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 4539d77f0d

Change-Id: I162f661280299c193d5c5b95596de5a1d99b3c9f