Snap for 4759746 from b8d236eb4e3c945a2d7163d1235b3273ede0e932 to pi-release

Change-Id: I6dee73b5f5641b10607ed0e5716ca7be9cb22c49