Snap for 4713750 from 0708cde464d97fc0a1b251f0431f6fe29f07b47d to pi-release

Change-Id: I3d4b832748ebe847799fa346e6ab5434a9aba33f