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

Change-Id: I1e8701c82ec6f9362587366e9aac4844a0570101