Snap for 4832339 from daf4f493317340c9c3b49176f36a93d4ce3385f4 to pi-release

Change-Id: I2f17f73892b3a9ee32394c33d398363e71b8c721