Snap for 4531101 from 420534939aeb3b3d155388cf87b71f5432485ed9 to pi-release

Change-Id: I8bf8a96fb300caa4ef47484d1d453141e8a42dc2