Snap for 5217200 from ba1deea30d83f411a703bb2e68cb0d04ae11b23f to pi-b4s4-release

Change-Id: Ic5f81f8245d1042bb6e04e0d131dd22eec2b5fb2