Snap for 4706961 from 0494cf0007eb41d1729ecd1407a4ed6bf85066c3 to pi-release

Change-Id: I80262e26ed30a58bf64b861884bbef235660b191