Snap for 4745538 from 404c4bc4a2b5b662d5d796f4085e33f0f7aeb5b8 to pi-release

Change-Id: I1c034f87fbe2f447718e629e29ea7cf80f3ef272