Snap for 4683893 from fd75f2cd95d4c37cb9ee3cc1c95a367b34b3da3c to pi-release

Change-Id: I342742a7f2cd846a3562379197ee4c7e58a907ea