Snap for 4807121 from dac8340c437c9dafcc7e621f9dafa6a2239c3ca9 to pi-release

Change-Id: I4b803b5233ed4a824267473b2cc8449092966890