Snap for 4531101 from 27fa808b34717de45f9850a24e882344024f8e86 to pi-release

Change-Id: I4fcaa2b5f4babb46e47e6661c7b3f16034eaf794