Snap for 4509671 from 3abffbf9f375b9448f2cb35d921d0822bf928874 to pi-release

Change-Id: I4f9d51a4db572e02dffdb4e5e1780f7732244454