Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am: 2fa4c0fedd

Change-Id: Id9bc5121754c0b3184608940020fa1a0612232ce