Snap for 4439972 from 513446cf1c669177f464689d9166f30e59026f12 to pi-release

Change-Id: I3e31181c259dbb488b01fa7f9a71ff8b11474944