Snap for 4551672 from eaf71352f0d02c3bda999319008fa14ed8b9cd5b to pi-release

Change-Id: Ia6333134e6c04ff2fe49ac7d98a91e0ad5747c12