Snap for 4670666 from fa3a2f294ffc298da295ad33d8a5d8fbd26e6f3c to pi-release

Change-Id: I1c5c37699026f9e1dddda567729474eb9e1c0a50