Snap for 4829593 from ba88c2e9bcfb8665ef8fe55eab3b3d0895d0592c to pi-release

Change-Id: I6a5657813f61abf9f34bcd67e699b60c50e35769