Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 27353e7065
am: 895848b506

Change-Id: If51e82cc5fe23e7466c2d2e952c517f35ec26a29