Snap for 4807121 from 6de8729657263d0dba112573298055d9396027d6 to pi-release

Change-Id: Ia6dce4a3bf6db94f344421e74795a23233b025fb