Snap for 4496165 from bad2a87b3c2e8812f2a2ba395054cd533483f506 to pi-release

Change-Id: I4ae6e131d1c28ea770d81eb6ac906f2e0beb1cfa