Snap for 4632767 from 8e45e66befc7ad38b7762e7481a8df518780b490 to pi-release

Change-Id: I28576343efbb657d69944dcb952e4f2007addd6b