Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 26715ec73c
am: 86977e2e33

Change-Id: I4479f561401a7279f23562465c3d8a7eea6589bd