Snap for 4402171 from 134f3faa4d7c7c8a062e7d581d23537800e6fb11 to pi-release

Change-Id: If246f1d5c3e6cb8a8c1d738e86fdd62605ba5f47