Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am: 074624b203

Change-Id: I519b621ad644740745734bd9f2c96f1da571508d