Snap for 4725392 from 02315661e9119e78d42303609671f08138e4665e to pi-release

Change-Id: Ibc79cce51c2caf7a5c92504b9e3dc8015740df16