Snap for 4667902 from 099260928a814f48f27b8ff532a6af782a67f34d to pi-release

Change-Id: I55a286aa2a0b9bf1b4b563583870cd1ae3549d77