Snap for 10453563 from dab5a943946be1805fedc9c609c1a6647f156f9e to mainline-uwb-release

Change-Id: Id7e57542c2217355bd239a1f3661d125087434b9