Snap for 4517567 from eb5babdf3eaaf8e2f77cf0db648f202c83398574 to pi-release

Change-Id: I0ed49ce6fc673163c0e9aad3628792ce193b40dd