Snap for 4625912 from 6b56b692bc74a19f293e378c0dffea15460f4870 to pi-release

Change-Id: I7481c5218a745924766dc0a7845ee64de4c14403