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

Change-Id: If069c723951fb42cdb0c599e561f762ec2a50a88