Snap for 5096767 from e77572d76d311ac83449127d550875f778080d9c to pi-b4s4-release

Change-Id: I0d55c3777377d8fe3a12dec56276bb819bc19988