Snap for 4759746 from f249555f97cf3a5cd128774bd4338d83e455e772 to pi-release

Change-Id: If4a6919ce0aa7856040fa5a7e39fe879bd8532b6