Snap for 4754571 from 2ccfec574e0a9e81cf62d37432c17d6d2c81ae71 to pi-release

Change-Id: Ia5070c68da699cf25bd1b7314aa44767a0cd76e4