Snap for 4590521 from e1e1218461d49b23d46af0d552edc5b80c8b2b4d to pi-release

Change-Id: I3e92914f3d92354e067ce397dd22db4234b4aac1