Snap for 4765094 from ded96ac6cd0e77ee864e829d9d3127283228dc5f to pi-release

Change-Id: Ifefb826040a3d2afb194c4f17a1ec9e36b59d424