Snap for 4375922 from 37efefc94d6c3033a56f28fb08fdd8124d88a8a7 to pi-release

Change-Id: I0057ebf504ec34b8cb00c895a765e1fbcb030a66