Snap for 4577102 from b4496fefd352cec7f599b511f3ab5f43119d4ab4 to pi-release

Change-Id: I1757d4ddd372d321a1e40801aa1db6d4831de85c