Snap for 4778776 from 83f0dac26f82afd9743f314902517c07c482489d to pi-release

Change-Id: I6b026442cdb40b7e20e629a0e5ba95723205fac5