Snap for 4813226 from 87c31720385357aa1c23df4affa32aca8e234468 to pi-release

Change-Id: I02e9e1b6f15d13b74b1df3c4fa6aa6bdd6d3ba23