Snap for 4759746 from 7f53f9d5e6dfd73b8109b3c4ec633909d9b9650d to pi-release

Change-Id: I5092cbdf1da2ab9d38fd53075a29089253986f15