Snap for 5180536 from 1a20ffabcdd4db755fdbadf1a856b1f17837606a to pi-platform-release

Change-Id: I5552fe9d4b410395fd27ac6f9de45854aad852af