Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 12e0362fd8

Change-Id: I0f4e22435cd6b2f9beca188011cd3cdffab55671