Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: a2040e8bcd
am: 7a5f547073

Change-Id: I086cade712d57e7fc41e43e880854bdfdd43a5b2