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

Change-Id: I3b6c0299c668d3b8232325332a759ba1b4dcd3b5