Snap for 10453563 from 91a73e141cfefdfe3a234d0b39782d15e4b069e3 to mainline-uwb-release

Change-Id: I64b46f069dcb4aa4dd5303087e42a4d1e12105d4