Snap for 4531101 from 4d4e832752e5d3ae2a67b40dd4ebe7828c1d419b to pi-release

Change-Id: I730bb80707c962029b31f486ec3931496d31676f