Snap for 4706961 from c86794178367dbce3271fe307cbaed81fd2617b4 to pi-release

Change-Id: I4121bb5e6453557c7c61f5d569c5d13022ebbc13