Snap for 4425573 from 6788a4139092f179005f7cdbf181ba24b60b6113 to pi-release

Change-Id: Ie377f8b33ef632c11f587c8bcc26004f7338238c