Snap for 4662763 from 5b9335f1b17e7fbf0babed56a0cbe7b3e7682bea to pi-release

Change-Id: I0dd342f6c53d5faf1359fc313774d68f69352b9c