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

Change-Id: I250d1dbd4d0436d065f9b67506bc276eb0716105