Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 8c74842d6d
am: ec62359d3f

Change-Id: I5fc870c21f2d6ae4126b1415bce2689c1b679972