Snap for 4386413 from 762b7b666bd1fffe6571b0d1c67d72bdf8d0d456 to pi-release

Change-Id: I6e9b8211b8164ced85221384b049d3ecd2337817