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

Change-Id: I7bde10740933d3e923fa8cb763d853f9f6d5d696