Snap for 4469253 from 7344422616f90c0b6c5803f00bc851c249ef6e65 to pi-release

Change-Id: If3aeec79e56269f6209fd5d06fb2f689a2018351