Snap for 4481641 from aecfeb44309c1b2ef2628bf6c8147f1845b01792 to pi-release

Change-Id: I06674b48013146d8ce7d7321cdec78a3ac2b1a6f