Snap for 4375922 from d1792ee9c7397949745473749fac1738704256e4 to pi-release

Change-Id: Ic26f4fdedee6e86b6aea2dcc4ea6fde31ffdea2b