Snap for 4793185 from e93744bec9cb63b00b4597d49a20378749634358 to pi-release

Change-Id: I964a625e59517ba7dc9e67e5bd0211f4ec96a5b0