Snap for 4413317 from c3345dafb9444bfe5cc82588a9525ca09216bb57 to pi-release

Change-Id: I52d5f49e716fd36c3bd37f9d5acb60df86ac8a3f