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

Change-Id: I9783d2c9fa432af7d528727e7fed215cb1cee4dd