Snap for 4670666 from 2e0327ee45c9c2c31ad8a4df3c98d8649ec1f6d1 to pi-release

Change-Id: I095467d10f1120772ab1dfd799810cac8ac96a42