Snap for 4667902 from 75a43d595cbbd637294e0c54d98051fe03e06b83 to pi-release

Change-Id: I7e00f60927e5409a85ce29f5e842233bf577320f