Snap for 4722539 from eacb9c069756ff31df55f38d91610887ae079ac0 to pi-release

Change-Id: I97cc6990b6d75fcfd392494df1e5e51a406cca3f