Snap for 4651078 from 475db106115d4f25f0e41612a2a71a0cfe83ab38 to pi-release

Change-Id: Id57ae972986129904bf3712e025ca3098795ab16