Snap for 4453288 from 0acda6c822aba430d93044bbf2ebb9680b8969c2 to pi-release

Change-Id: I114936a91eee335b5dd186eda199e5d8b773ff60