Snap for 5674421 from 954a41631c773b98019f82b9b7dc484e574f9085 to pi-platform-release

Change-Id: I6e2c72609b0054626530f99696e5e1f8a107702b