Snap for 4799153 from e0e49140d22a6cb6299b94302c79f684d8489778 to pi-release

Change-Id: I02406573629fe9b1e457cc3b48ad6b7c165e3a72