Snap for 4759746 from 80cfa5665ab47808f1e2bafa0b8a0b4db743274b to pi-release

Change-Id: I368862d40a6ec47f96ffb08c4cbc207c839704d4