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

Change-Id: I323044a90c917359b1c2059abe64a7041c6af85c