Snap for 4410151 from 9b61f65f8bd88897da58fc270d20a92ec520854e to pi-release

Change-Id: I1e7ce14173aedc3bc5a2c9b5fc56631d4c969f6d