Snap for 4531101 from f63882aa035b8270c55a93e0db4e39c8ab573096 to pi-release

Change-Id: Ia0c17c9bbfdeb9787c5ce020682c5361cb952bd9