Snap for 4728508 from f76714893c654b874433e635d6b799f7c50c5b0c to pi-release

Change-Id: Ie11828de97196438ba42074e2bfa133ed1a241ee