Snap for 4473011 from a5c1a0a3b7241e3ec567d4fb32673fcfd98d4fc4 to pi-release

Change-Id: I46e0b02b2d139f65fe4f70e4a998aa8ec6981b83