Snap for 4647811 from fbe3f59de13abfd9bb77170b27dbccafe89a37da to pi-release

Change-Id: Ia3c7f4c9feb97ee1af09adde468595bac0b334c3