Snap for 4779114 from 2d11f2cdcab1246f3db0438e061811d40e483205 to pi-release

Change-Id: Ia77874fe6694278a3c565db02ac7c7b435c50d88