Snap for 4551672 from fe295ac5be7ace7e6ee4d1e27149e36b4ec73307 to pi-release

Change-Id: I258791ddd82efb1b62a06f3ced9c06e55120f8c8