Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 2a5bbd5b73
am: d0a4f2e8e5

Change-Id: Ibd1b2af5d12fb5e77394c8f2f71dab6daf5f5aba