Snap for 4829593 from c41ad31030de957ee6abcb53b96e20d009c83ac8 to pi-release

Change-Id: I07ee6db56b63a227b3fe9efa0d9bba6f575249b6