Snap for 4665332 from 43429b670005f5b524aebc1ca3be30800aaa6267 to pi-release

Change-Id: I98a22674eb3ee88d281a1271f8ad88ba46666f0d