Snap for 4535700 from f70cc79eb14b75db9c0da077a4d54bd00fbdfc99 to pi-release

Change-Id: Ia2ef2cb89ce2a3cee14ab95139b2c79297bf9cb8