Snap for 4571561 from fd3d59718149dd8b0ca199b9759dc055a8ddd82c to pi-release

Change-Id: I49cb5147d24f1627ad6ac1299c3f4d72f49b5ce0