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

Change-Id: I96b8e6e89d304f3cea9274ced17f2d10daaf4d97