Snap for 4587185 from e70c7dff4a433c03ff90f312194f04d8fd1d95c7 to pi-release

Change-Id: I6626d27b2d8e976396efc9db4092ce8844ff4b05