Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: e839e1290d
am: a4e3f6359e

Change-Id: I4769177f35c2d74f46c06335f5819b4e9f51306a