Snap for 4696032 from b6074811f8a33461c4745e324fac321708d2f11d to pi-release

Change-Id: Iaa0e32e3d49e083bb68553b1e2e1468c6bd0e1e4