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

Change-Id: I868d6ff34c4ee846a12ee6f9576ff02034e7383e