Snap for 4759746 from 434442da2a906db90779c376d95aa91f5428694b to pi-release

Change-Id: I49f0b6adc7fc6801867b7f5f15bea7dffed778ad