Snap for 4808111 from 8997b7e4c9eef423f73b7c61e926a66648473c24 to pi-release

Change-Id: I9f3996c7094562179fb36d6465238bf61d3a9df7