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

Change-Id: Ia68cf78369ec7aed212524c6307e9ec66f59f279