Snap for 4620899 from 41171be03f7a98e631cc6d5ecb97f38a23d31e7e to pi-release

Change-Id: I3d49becf69132a07af1b1b18ddf77224951ebe1c