Snap for 4407698 from c4a2e69ee25d092f2e3cc8c4db016cbe6f9461e5 to pi-release

Change-Id: I9db8621caf0918ce0a6e8bba52a10bfc76a3850c