Snap for 4620899 from 703fb7521f3fa18aed3c7e60cf56a9be5991e64e to pi-release

Change-Id: I3d0223eac6595cffa4fd7c31f0424f4c75855245