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

Change-Id: Ia61eabf15832199380475aeb4317b61e4bfd0f22