Snap for 4551672 from d1ba67ece1bce85f60be999572a0b6f1188150d7 to pi-release

Change-Id: I191d5c80c7b9cf6ec7d7304a85b9422531a1e16a