Snap for 4459973 from c3d5666b1d90abd892656852567bf3b5fb63ab29 to pi-release

Change-Id: I2feffda6bcf2dd09ab1b7167d7c0b2986424bc47