Snap for 4778776 from 3cce3b15a19de77203336aedfda490371348f38d to pi-release

Change-Id: Iaa64aeab646f2ae0d6e004dceac0c61b73591664