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

Change-Id: Ib2d0ad578b08737180658f8c7f2b8ae085b8359c