Snap for 4407698 from ab0ef05ddad3ffe0297ed8676489b6d4febc7dec to pi-release

Change-Id: I02fca2d39ef6ff5bb5aebf0df5e86d01278eab37