Snap for 4667902 from 0d3dc5b9d660e16004d1f8514d399f812dd486d3 to pi-release

Change-Id: Id2ecc6854c54428fad26c7fd4dbe6459d7846a78