Snap for 4807121 from e910b1686a40e017cdea91b0fc09d5b479d4ed9c to pi-release

Change-Id: I2e868f8511a3f80dccde0bc4d54dad9ea43629d3