Snap for 4531101 from 41bf13d9bda52ddee6ba2959a7f92babeb127257 to pi-release

Change-Id: I960bbdae5298378cdfd6a4ae64fcdad45a61625c