Snap for 4810559 from 03cb53a17d47e1a4777672e4ea76afa8e23f1d41 to pi-release

Change-Id: I8e7369bec8396f574ac8f74f6e471f38c0f95971