Snap for 4422293 from 01674e16c6960096586ef6872d50e9f83d585338 to pi-release

Change-Id: I982e04dbfc820bc0adde0c2759e02516dae6cfa2