Snap for 4683893 from d3edbc17fb33b5ee93c5ba370397612f069352c4 to pi-release

Change-Id: Id9644b923e6e7e4530377f23b47afb623f100ec3