Snap for 5180536 from b32be3f072132a2833e5ab963ce4a2592436805f to pi-platform-release

Change-Id: I75a97c71db475898cbe477b3048846574a89f97a