Snap for 4796401 from 93d48fe0b6e891d785caefdc02065da58e749c69 to pi-release

Change-Id: I9d5a3d4d48b6944b00e032511151eb1a4a391d4b