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

Change-Id: I51e0e7426e102409637f1feda37c0a0979bf7935