Snap for 4383777 from fd6454f5241fc37f9a205db12aa017c506f9b767 to pi-release

Change-Id: Ide8fe33edcbb5cefe4eebf52bb84a33b6456170b