Snap for 4496165 from d19788193143967b5f98dca1abe2e445bd03b8b6 to pi-release

Change-Id: I48fd87aec8e6b1cc7d7a4395b2ddd321ff8f6491