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

Change-Id: I87ecb76dccd5b8f20d1f8f521de984823456b26e