Snap for 4380820 from fef4cbf28d0ec73fd5e2724c0bae0b4bc730592c to pi-release

Change-Id: I5676b3efbd95c29de507667a59288f30dcd95562