Snap for 5674421 from 87ba04ee03e404a61569a5f746148d5c475e179c to pi-platform-release

Change-Id: Ia73478096d83939ba11396632be8e37b6c73b5f7