Snap for 4623514 from da1d9eb81f2d19b66d200919e8274e73e9e45a41 to pi-release

Change-Id: I0b1e357ed6078987b703ff5b047d6479cf32db7e