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

Change-Id: I3b5ff406a88e04b737e9080821573bb162e9fd9e