Snap for 4722539 from 757d589afbd3085fc21caa04fdc16435edaaa401 to pi-release

Change-Id: I232067a3aa9627005d5edc0e3d380d65f9d10522