Snap for 4716599 from 38a50121f8cc73cabec72eef17e320c557c164d9 to pi-release

Change-Id: Ifc68548d7bcc6811a6a9da0075a5a251e32bc8c9