Snap for 4713750 from f586eedb674be4800611d4082c0503ffd34546a8 to pi-release

Change-Id: Ifd45a9a525883d98897e4ede451eac04f71ead5d