Snap for 4773106 from c851db8a41493d64a67713ca9543dc29abe29368 to pi-release

Change-Id: I472f364d7ae2ed1a8514bbdb733bfd479d9b56d9