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

Change-Id: Ie9677752230593faec25a58bab7809374c42a6cc