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

Change-Id: Ie8806ae12a03fd096fa0cd96a88957180c114da4