Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am: 004d3bfc3f

Change-Id: Ic9f111a5f8bfc1cd2dba8c6877f56ac05526518a