Snap for 4686875 from c0f2da484a7b7b814b9fb939a101fc9bbcba9a43 to pi-release

Change-Id: I1461ecb4ad9fb1927e4bf05e55b426ec59829731