Snap for 4778776 from f4dcfc8ad201ea0b0b5599a9fa1f1a437cb21553 to pi-release

Change-Id: I33677983d9348df215104d75a1c5ddf9f24904cf