Snap for 4829593 from 00d504d2d3d14a8a11113993aa9c28ff61541d36 to pi-release

Change-Id: I09cd97e053c3f1198778a2643743fc7880171f8d