Snap for 4473011 from a1ed8f1f0238e6a464cc804fb0483effbdd38134 to pi-release

Change-Id: Iaa067485689d3d5c31a65bd78635c822d2a748c8