Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 44de687b93
am: 5a0817ce57

Change-Id: I872c4eb99d693c48a174cbd98231c75af199ed79