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

Change-Id: I931e126b7e3843c8e5bbf480e14dab6318557c30