Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am: 5a7ec88405

Change-Id: Id3e57fd2be67fe7e8477fe601a828787ac71f6fd