Snap for 4701683 from aee02cd7988ee0f1087c06ce04e41ad521c5ecda to pi-release

Change-Id: I99ef25c3126c1aa9854953e0c6bc5e94e69c69a0