Snap for 4728508 from 9302cf252687b8705570b794a901959efc0c26af to pi-release

Change-Id: I713b6fc698af14a79ec2db841662fb565622b7bd