Snap for 4496165 from 6c6634a26785d16b058ee3799f69cd3606a557ca to pi-release

Change-Id: I4249e8ffc1efa59b665bb24f7c80f8b49674bcff