Snap for 4455093 from 50bf5f2fd4d05c6c62b17a6179947d5cabaef166 to pi-release

Change-Id: I5eb04d444ad1edbfd09e4efdad8a50701d6ef841