Snap for 4778776 from 3ae7d9ba54de8940f04dcf43bc751d0fa7ddaa77 to pi-release

Change-Id: Ia2d4f9b15f72e143bdcc86d7d28281110b5e06f6