Snap for 4807121 from f19e863cce96cc1e5f4ad7ce512810d5a2843ea6 to pi-release

Change-Id: I8797944fb72a1182a059e75425a8b54b4e8abf51