Snap for 4517567 from ad452ff064530a8a5d9d022ea4a4913cd998d78a to pi-release

Change-Id: I7f021b6a957d8371740a772656dc2cfb838c1654