Snap for 4793185 from e0f05231f9780315700a3ed1f2080f9189622ae0 to pi-release

Change-Id: I80a1e2785ca97625747c043ab7976ff897614ae7