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

Change-Id: If8bb8c71913f71b30d0a3aabf1605cd133504701