Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 15341daf67
am: f6b152501f

Change-Id: I7542106830a497322c5ce795c5c64529095874c8