Snap for 4590521 from fe263b2505fe71584149874ee8a441149676bd9a to pi-release

Change-Id: I4ea5ace33d4be3a7d1c383353b7054d9ad71d6be