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

Change-Id: I60b186392344b464016c0b5415e4a9d4a57f72de