Snap for 4620899 from f7b46c0241c54fb49f3072380a67107a6729daec to pi-release

Change-Id: I4a3823cf3a82617ba7a6362ba6eb1437552bae4d