Snap for 4647811 from 6e9d38c22ca527d952fcd1591d1b4fa1f86ecc5e to pi-release

Change-Id: Ia8a98abcec15f38679b92415fd71c138c1a28994