Snap for 4396096 from 17419e375a180d2b55274c8bf634f9ded674bd0a to pi-release

Change-Id: Icc63a3d341b7d2d848decf94d9d0d022878e9db4